HDFS-15963. Unreleased volume references cause an infinite loop.#2889
Merged
Hexiaoqiao merged 5 commits intoapache:trunkfrom Apr 16, 2021
Merged
HDFS-15963. Unreleased volume references cause an infinite loop.#2889Hexiaoqiao merged 5 commits intoapache:trunkfrom
Hexiaoqiao merged 5 commits intoapache:trunkfrom
Conversation
|
💔 -1 overall
This message was automatically generated. |
zhangshuyan0
force-pushed
the
releaseVolumeRef
branch
3 times, most recently
from
fd41b65 to
c81875c
Compare
zhangshuyan0
force-pushed
the
releaseVolumeRef
branch
from
c81875c to
fa37c6a
Compare
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
jojochuang
requested changes
Apr 12, 2021
| } catch (RuntimeException re) { | ||
| int afterCnt = vol.getReferenceCount(); | ||
| assertEquals(beforeCnt, afterCnt); | ||
| re.printStackTrace(); |
Contributor
There was a problem hiding this comment.
printing the stack trace is redundant here. let's remove it?
Contributor
Author
There was a problem hiding this comment.
Ok, I'll remove it.
| } | ||
| } | ||
|
|
||
| @Test |
Contributor
There was a problem hiding this comment.
We should add a timeout (a class-wide timeout is preferred) here.
Contributor
Author
There was a problem hiding this comment.
Thanks, I'll add it.
...va/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskAsyncLazyPersistService.java
Show resolved
Hide resolved
...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
Show resolved
Hide resolved
...in/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java
Show resolved
Hide resolved
| int afterCnt = volume.getReferenceCount(); | ||
| assertEquals(beforeCnt, afterCnt); | ||
|
|
||
| } catch (InterruptedException e) { |
Contributor
There was a problem hiding this comment.
If it interrupts, let it throw. No need to handle the exception.
Contributor
There was a problem hiding this comment.
Sorry I wasn't being clear myself. You don't have to catch the exception. Instead, add InterruptedException to the test method signature.
| Assert.assertTrue( | ||
| beforeCnts[i] == afterCnt || beforeCnts[i] == (afterCnt - 1)); | ||
| } | ||
| } catch (InterruptedException e) { |
Contributor
There was a problem hiding this comment.
no need to handle the interruption
Contributor
There was a problem hiding this comment.
Sorry I wasn't being clear myself. You don't have to catch the exception. Instead, add InterruptedException to the test method signature.
| } | ||
|
|
||
| @Test | ||
| public void testReleaseVolumeRefIfExceptionThrown() throws IOException { |
Contributor
There was a problem hiding this comment.
It would be great if we could rewritten this test as a true unit test: A BlockSender with mocks. However, given the dependency on the DataNode class, I recognize this is not trivial.
...-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
Show resolved
Hide resolved
Contributor
Author
|
Failed junit tests have nothing to do with this PR. I ran them locally and all of them passed. |
jojochuang
reviewed
Apr 13, 2021
Contributor
jojochuang
left a comment
jojochuang
left a comment
There was a problem hiding this comment.
Looks almost ready. Just nits in the test.
| Assert.assertTrue( | ||
| beforeCnts[i] == afterCnt || beforeCnts[i] == (afterCnt - 1)); | ||
| } | ||
| } catch (InterruptedException e) { |
Contributor
There was a problem hiding this comment.
Sorry I wasn't being clear myself. You don't have to catch the exception. Instead, add InterruptedException to the test method signature.
| int afterCnt = volume.getReferenceCount(); | ||
| assertEquals(beforeCnt, afterCnt); | ||
|
|
||
| } catch (InterruptedException e) { |
Contributor
There was a problem hiding this comment.
Sorry I wasn't being clear myself. You don't have to catch the exception. Instead, add InterruptedException to the test method signature.
|
💔 -1 overall
This message was automatically generated. |
Contributor
|
Please fix the spotbugs warning. Other than that I am +1. |
Contributor
|
Thanks @zhangshuyan0 for your great catch here. LGTM. +1 from my side. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
Hexiaoqiao
approved these changes
Apr 15, 2021
Contributor
Hexiaoqiao
left a comment
Hexiaoqiao
left a comment
There was a problem hiding this comment.
The failed unit tests seem not related to this PR. +1.
@jojochuang do you mind give double check? I think it is ready to commit this PR. anymore suggestions? Thanks.
Contributor
|
@jojochuang Hi Wei-Chiu, any furthermore comment here? If not, I would like to commit this PR shortly. Thanks. |
Contributor
|
Go ahead. Thanks! |
jojochuang
approved these changes
Apr 16, 2021
Contributor
|
Committed to trunk. Thanks @zhangshuyan0 for your works! Thanks @jojochuang for your reviews! |
zhangshuyan0
added a commit
to zhangshuyan0/hadoop
that referenced
this pull request
Apr 21, 2021
…che#2889) Contributed by Shuyan Zhang. Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org> Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
kiran-maturi
pushed a commit
to kiran-maturi/hadoop
that referenced
this pull request
Nov 24, 2021
…che#2889) Contributed by Shuyan Zhang. Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org> Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch releases the three previously unreleased volume references.